+Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
+ signals to make them more clear. Also, change ::range_changed to
+ ::row_changed.
+ * gtk/gtktreemodel.c: Adjust to interface change
+ * gtk/gtktreemodel.h: ditto
+ * gtk/gtktreemodelsort.c: ditto
+ * gtk/gtktreestore.c: ditto
+ * gtk/gtkliststore.c: ditto
+ * gtk/gtktreeview.c: ditto
+ * tests/testtreecolumns.c: ditto
+ * gtk/gtkmarshal.list: Actually remove a marshaller!
+
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c
+Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
+ signals to make them more clear. Also, change ::range_changed to
+ ::row_changed.
+ * gtk/gtktreemodel.c: Adjust to interface change
+ * gtk/gtktreemodel.h: ditto
+ * gtk/gtktreemodelsort.c: ditto
+ * gtk/gtktreestore.c: ditto
+ * gtk/gtkliststore.c: ditto
+ * gtk/gtktreeview.c: ditto
+ * tests/testtreecolumns.c: ditto
+ * gtk/gtkmarshal.list: Actually remove a marshaller!
+
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c
+Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
+ signals to make them more clear. Also, change ::range_changed to
+ ::row_changed.
+ * gtk/gtktreemodel.c: Adjust to interface change
+ * gtk/gtktreemodel.h: ditto
+ * gtk/gtktreemodelsort.c: ditto
+ * gtk/gtktreestore.c: ditto
+ * gtk/gtkliststore.c: ditto
+ * gtk/gtktreeview.c: ditto
+ * tests/testtreecolumns.c: ditto
+ * gtk/gtkmarshal.list: Actually remove a marshaller!
+
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c
+Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
+ signals to make them more clear. Also, change ::range_changed to
+ ::row_changed.
+ * gtk/gtktreemodel.c: Adjust to interface change
+ * gtk/gtktreemodel.h: ditto
+ * gtk/gtktreemodelsort.c: ditto
+ * gtk/gtktreestore.c: ditto
+ * gtk/gtkliststore.c: ditto
+ * gtk/gtktreeview.c: ditto
+ * tests/testtreecolumns.c: ditto
+ * gtk/gtkmarshal.list: Actually remove a marshaller!
+
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c
+Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
+ signals to make them more clear. Also, change ::range_changed to
+ ::row_changed.
+ * gtk/gtktreemodel.c: Adjust to interface change
+ * gtk/gtktreemodel.h: ditto
+ * gtk/gtktreemodelsort.c: ditto
+ * gtk/gtktreestore.c: ditto
+ * gtk/gtkliststore.c: ditto
+ * gtk/gtktreeview.c: ditto
+ * tests/testtreecolumns.c: ditto
+ * gtk/gtkmarshal.list: Actually remove a marshaller!
+
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c
+Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
+ signals to make them more clear. Also, change ::range_changed to
+ ::row_changed.
+ * gtk/gtktreemodel.c: Adjust to interface change
+ * gtk/gtktreemodel.h: ditto
+ * gtk/gtktreemodelsort.c: ditto
+ * gtk/gtktreestore.c: ditto
+ * gtk/gtkliststore.c: ditto
+ * gtk/gtktreeview.c: ditto
+ * tests/testtreecolumns.c: ditto
+ * gtk/gtkmarshal.list: Actually remove a marshaller!
+
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c
+Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
+ signals to make them more clear. Also, change ::range_changed to
+ ::row_changed.
+ * gtk/gtktreemodel.c: Adjust to interface change
+ * gtk/gtktreemodel.h: ditto
+ * gtk/gtktreemodelsort.c: ditto
+ * gtk/gtktreestore.c: ditto
+ * gtk/gtkliststore.c: ditto
+ * gtk/gtktreeview.c: ditto
+ * tests/testtreecolumns.c: ditto
+ * gtk/gtkmarshal.list: Actually remove a marshaller!
+
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c
@GTK_FONT_SCALABLE_BITMAP: scaled bitmap fonts.
@GTK_FONT_ALL: a bitwise combination of all of the above.
-<!-- ##### ARG GtkFrame:shadow-type ##### -->
-<para>
-
-</para>
-
-
<!-- ##### ARG GtkHScale:adjustment ##### -->
<para>
the #GtkAdjustment which sets the range of the scale.
</para>
+<!-- ##### ARG GtkFrame:shadow-type ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG GtkFrame:label-widget ##### -->
<para>
Determines the shadow type for the handlebox.
</para>
+<!-- ##### ARG GtkHandleBox:shadow-type ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG GtkHandleBox:handle-position ##### -->
<para>
Determines the side of the handlebox where the handle is drawn.
#GtkRcStyle structures to form a #GtkStyle.
</para>
-@parent_instance:
@name:
@bg_pixmap_name:
@font_desc:
</para>
@g_iface:
-@range_changed:
-@inserted:
-@has_child_toggled:
-@deleted:
-@reordered:
+@row_changed:
+@row_inserted:
+@row_has_child_toggled:
+@row_deleted:
+@rows_reordered:
@get_flags:
@get_n_columns:
@get_column_type:
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (list_store), path, iter, path, iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (list_store), path, iter, path, iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
validate_list_store (list_store);
list_store->stamp ++;
- gtk_tree_model_deleted (GTK_TREE_MODEL (list_store), path);
+ gtk_tree_model_row_deleted (GTK_TREE_MODEL (list_store), path);
gtk_tree_path_free (path);
if (next)
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, position);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, i);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, i);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, 0);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, list_store->length - 1);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
G_SLIST (dest_iter.user_data)->data = copy_head;
path = gtk_list_store_get_path (GTK_TREE_MODEL (tree_model), &dest_iter);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (tree_model), path, &dest_iter, path, &dest_iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_model), path, &dest_iter);
gtk_tree_path_free (path);
}
}
path = gtk_tree_path_new ();
iter.stamp = list_store->stamp;
iter.user_data = NULL;
- gtk_tree_model_reordered (GTK_TREE_MODEL (list_store),
- path, &iter, new_order);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
+ path, &iter, new_order);
gtk_tree_path_free (path);
g_free (new_order);
g_array_free (sort_array, TRUE);
tmp_path = gtk_tree_path_new ();
tmp_iter.user_data = NULL;
- gtk_tree_model_reordered (GTK_TREE_MODEL (list_store),
- tmp_path, &tmp_iter,
- new_order);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
+ tmp_path, &tmp_iter,
+ new_order);
gtk_tree_path_free (tmp_path);
g_free (new_order);
VOID:BOOLEAN,BOOLEAN,BOOLEAN
VOID:BOXED
VOID:BOXED,BOXED
-VOID:BOXED,BOXED,BOXED,BOXED
VOID:BOXED,BOXED,POINTER
VOID:BOXED,POINTER
VOID:BOXED,OBJECT
VOID:BOOLEAN,BOOLEAN,BOOLEAN
VOID:BOXED
VOID:BOXED,BOXED
-VOID:BOXED,BOXED,BOXED,BOXED
VOID:BOXED,BOXED,POINTER
VOID:BOXED,POINTER
VOID:BOXED,OBJECT
if (! initialized)
{
- g_signal_new ("range_changed",
+ g_signal_new ("row_changed",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, range_changed),
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_changed),
NULL, NULL,
- gtk_marshal_VOID__BOXED_BOXED_BOXED_BOXED,
- G_TYPE_NONE, 4,
- GTK_TYPE_TREE_PATH,
- GTK_TYPE_TREE_ITER,
+ gtk_marshal_VOID__BOXED_BOXED,
+ G_TYPE_NONE, 2,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER);
- g_signal_new ("inserted",
+ g_signal_new ("row_inserted",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, inserted),
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER);
- g_signal_new ("has_child_toggled",
+ g_signal_new ("row_has_child_toggled",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, has_child_toggled),
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_has_child_toggled),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER);
- g_signal_new ("deleted",
+ g_signal_new ("row_deleted",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, deleted),
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted),
NULL, NULL,
gtk_marshal_VOID__BOXED,
G_TYPE_NONE, 1,
GTK_TYPE_TREE_PATH);
- g_signal_new ("reordered",
+ g_signal_new ("rows_reordered",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, reordered),
+ G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED_POINTER,
G_TYPE_NONE, 3,
}
}
+/**
+ * gtk_tree_model_row_changed:
+ * @tree_model: A #GtkTreeModel
+ * @path: A #GtkTreePath pointing to the changed row
+ * @iter: A valid #GtkTreeIter pointing to the changed row
+ *
+ * Emits the "row_changed" signal on @tree_model.
+ **/
void
-gtk_tree_model_range_changed (GtkTreeModel *tree_model,
- GtkTreePath *start_path,
- GtkTreeIter *start_iter,
- GtkTreePath *end_path,
- GtkTreeIter *end_iter)
+gtk_tree_model_row_changed (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter)
{
gint i;
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
- g_return_if_fail (start_path != NULL);
- g_return_if_fail (start_iter != NULL);
- g_return_if_fail (end_path != NULL);
- g_return_if_fail (end_iter != NULL);
-
-#ifndef G_DISABLE_CHECKS
- g_return_if_fail (start_path->depth == end_path->depth);
- for (i = 0; i < start_path->depth - 1; i++)
- if (start_path->indices[i] != end_path->indices[i])
- {
- g_warning ("Concurrent paths were not passed in to gtk_tree_model_range_changed.\n");
- return;
- }
-#endif
- g_signal_emit_by_name (tree_model, "range_changed",
- start_path, start_iter,
- end_path, end_iter);
+ g_return_if_fail (path != NULL);
+ g_return_if_fail (iter != NULL);
+
+ g_signal_emit_by_name (tree_model, "row_changed", path, iter);
}
+/**
+ * gtk_tree_model_row_inserted:
+ * @tree_model: A #GtkTreeModel
+ * @path: A #GtkTreePath pointing to the inserted row
+ * @iter: A valid #GtkTreeIter pointing to the inserted row
+ *
+ * Emits the "row_inserted" signal on @tree_model
+ **/
void
-gtk_tree_model_inserted (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter)
+gtk_tree_model_row_inserted (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter)
{
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (path != NULL);
g_return_if_fail (iter != NULL);
- g_signal_emit_by_name (tree_model, "inserted", path, iter);
+ g_signal_emit_by_name (tree_model, "row_inserted", path, iter);
}
+/**
+ * gtk_tree_model_row_has_child_toggled:
+ * @tree_model: A #GtkTreeModel
+ * @path: A #GtkTreePath pointing to the changed row
+ * @iter: A valid #GtkTreeIter pointing to the changed row
+ *
+ * Emits the "row_has_child_toggled" signal on @tree_model. This should be
+ * called by models after the child state of a node changes.
+ **/
void
-gtk_tree_model_has_child_toggled (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter)
+gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter)
{
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (path != NULL);
g_return_if_fail (iter != NULL);
- g_signal_emit_by_name (tree_model, "has_child_toggled", path, iter);
+ g_signal_emit_by_name (tree_model, "row_has_child_toggled", path, iter);
}
void
-gtk_tree_model_deleted (GtkTreeModel *tree_model,
- GtkTreePath *path)
+gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
+ GtkTreePath *path)
{
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (path != NULL);
- g_signal_emit_by_name (tree_model, "deleted", path);
+ g_signal_emit_by_name (tree_model, "row_deleted", path);
}
void
-gtk_tree_model_reordered (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gint *new_order)
+gtk_tree_model_rows_reordered (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gint *new_order)
{
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (new_order != NULL);
- g_signal_emit_by_name (tree_model, "reordered", path, iter, new_order);
+ g_signal_emit_by_name (tree_model, "rows_reordered", path, iter, new_order);
}
connect_ref_callbacks (GtkTreeModel *model)
{
g_signal_connect (G_OBJECT (model),
- "inserted",
+ "row_inserted",
(GCallback) gtk_tree_row_ref_inserted_callback,
model);
g_signal_connect (G_OBJECT (model),
- "deleted",
+ "row_deleted",
(GCallback) gtk_tree_row_ref_deleted_callback,
model);
g_signal_connect (G_OBJECT (model),
- "reordered",
+ "rows_reordered",
(GCallback) gtk_tree_row_ref_reordered_callback,
model);
}
GTypeInterface g_iface;
/* Signals */
- void (* range_changed) (GtkTreeModel *tree_model,
- GtkTreePath *start_path,
- GtkTreeIter *start_iter,
- GtkTreePath *end_path,
- GtkTreeIter *end_iter);
- void (* inserted) (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter);
- void (* has_child_toggled) (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter);
- void (* deleted) (GtkTreeModel *tree_model,
- GtkTreePath *path);
- void (* reordered) (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gint *new_order);
+ void (* row_changed) (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter);
+ void (* row_inserted) (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter);
+ void (* row_has_child_toggled) (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter);
+ void (* row_deleted) (GtkTreeModel *tree_model,
+ GtkTreePath *path);
+ void (* rows_reordered) (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gint *new_order);
/* Virtual Table */
GtkTreeModelFlags (* get_flags) (GtkTreeModel *tree_model);
/* Signals */
-void gtk_tree_model_range_changed (GtkTreeModel *tree_model,
- GtkTreePath *start_path,
- GtkTreeIter *start_iter,
- GtkTreePath *end_path,
- GtkTreeIter *end_iter);
-void gtk_tree_model_inserted (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter);
-void gtk_tree_model_has_child_toggled (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter);
-void gtk_tree_model_deleted (GtkTreeModel *tree_model,
- GtkTreePath *path);
-void gtk_tree_model_reordered (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gint *new_order);
+void gtk_tree_model_row_changed (GtkTreeModel *tree_model,
+ GtkTreePath *start_path,
+ GtkTreeIter *start_iter);
+void gtk_tree_model_row_inserted (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter);
+void gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter);
+void gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
+ GtkTreePath *path);
+void gtk_tree_model_rows_reordered (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gint *new_order);
+
#define get_array(e,t) ((GArray *)((e)->parent?(e)->parent->children:GTK_TREE_MODEL_SORT(t)->root))
/* object init and signal handlers */
-static void gtk_tree_model_sort_init (GtkTreeModelSort *tree_model_sort);
-static void gtk_tree_model_sort_class_init (GtkTreeModelSortClass *tree_model_sort_class);
-static void gtk_tree_model_sort_tree_model_init (GtkTreeModelIface *iface);
-static void gtk_tree_model_sort_tree_sortable_init (GtkTreeSortableIface *iface);
-static void gtk_tree_model_sort_finalize (GObject *object);
-static void gtk_tree_model_sort_range_changed (GtkTreeModel *model,
- GtkTreePath *start_path,
- GtkTreeIter *start_iter,
- GtkTreePath *end_path,
- GtkTreeIter *end_iter,
- gpointer data);
-static void gtk_tree_model_sort_inserted (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data);
-static void gtk_tree_model_sort_has_child_toggled (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data);
-static void gtk_tree_model_sort_deleted (GtkTreeModel *model,
- GtkTreePath *path,
- gpointer data);
+static void gtk_tree_model_sort_init (GtkTreeModelSort *tree_model_sort);
+static void gtk_tree_model_sort_class_init (GtkTreeModelSortClass *tree_model_sort_class);
+static void gtk_tree_model_sort_tree_model_init (GtkTreeModelIface *iface);
+static void gtk_tree_model_sort_tree_sortable_init (GtkTreeSortableIface *iface);
+static void gtk_tree_model_sort_finalize (GObject *object);
+static void gtk_tree_model_sort_row_changed (GtkTreeModel *model,
+ GtkTreePath *start_path,
+ GtkTreeIter *start_iter,
+ gpointer data);
+static void gtk_tree_model_sort_row_inserted (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data);
+static void gtk_tree_model_sort_row_has_child_toggled (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data);
+static void gtk_tree_model_sort_row_deleted (GtkTreeModel *model,
+ GtkTreePath *path,
+ gpointer data);
+static void gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
+ GtkTreePath *s_path,
+ GtkTreeIter *s_iter,
+ gint *new_order,
+ gpointer data);
-static void gtk_tree_model_sort_reordered (GtkTreeModel *s_model,
- GtkTreePath *s_path,
- GtkTreeIter *s_iter,
- gint *new_order,
- gpointer data);
/* TreeModel interface */
static gint gtk_tree_model_sort_get_n_columns (GtkTreeModel *tree_model);
tree_model_sort->changed_id =
g_signal_connect (child_model,
- "range_changed",
- G_CALLBACK (gtk_tree_model_sort_range_changed),
+ "row_changed",
+ G_CALLBACK (gtk_tree_model_sort_row_changed),
tree_model_sort);
tree_model_sort->inserted_id =
g_signal_connect (child_model,
- "inserted",
- G_CALLBACK (gtk_tree_model_sort_inserted),
+ "row_inserted",
+ G_CALLBACK (gtk_tree_model_sort_row_inserted),
tree_model_sort);
tree_model_sort->has_child_toggled_id =
g_signal_connect (child_model,
- "has_child_toggled",
- G_CALLBACK (gtk_tree_model_sort_has_child_toggled),
+ "row_has_child_toggled",
+ G_CALLBACK (gtk_tree_model_sort_row_has_child_toggled),
tree_model_sort);
tree_model_sort->deleted_id =
g_signal_connect (child_model,
- "deleted",
- G_CALLBACK (gtk_tree_model_sort_deleted),
+ "row_deleted",
+ G_CALLBACK (gtk_tree_model_sort_row_deleted),
tree_model_sort);
tree_model_sort->reordered_id =
g_signal_connect (child_model,
- "reordered",
- G_CALLBACK (gtk_tree_model_sort_reordered),
+ "rows_reordered",
+ G_CALLBACK (gtk_tree_model_sort_rows_reordered),
tree_model_sort);
tree_model_sort->flags = gtk_tree_model_get_flags (child_model);
}
static void
-gtk_tree_model_sort_range_changed (GtkTreeModel *s_model,
- GtkTreePath *s_start_path,
- GtkTreeIter *s_start_iter,
- GtkTreePath *s_end_path,
- GtkTreeIter *s_end_iter,
- gpointer data)
+gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
+ GtkTreePath *s_path,
+ GtkTreeIter *s_iter,
+ gpointer data)
{
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreePath *path;
gint index;
SortElt tmp;
- g_return_if_fail (s_start_path != NULL || s_start_iter != NULL);
+ g_return_if_fail (s_path != NULL || s_iter != NULL);
- if (s_start_path == NULL)
+ if (s_path == NULL)
{
free_s_path = TRUE;
- s_start_path = gtk_tree_model_get_path (s_model, s_start_iter);
+ s_path = gtk_tree_model_get_path (s_model, s_iter);
}
- path = gtk_tree_model_sort_convert_path_real (tree_model_sort, s_start_path, FALSE);
+ path = gtk_tree_model_sort_convert_path_real (tree_model_sort, s_path, FALSE);
if (path == NULL)
{
if (free_s_path)
- gtk_tree_path_free (s_start_path);
+ gtk_tree_path_free (s_path);
return;
}
{
/* we're not going to care about this */
if (free_s_path)
- gtk_tree_path_free (s_start_path);
+ gtk_tree_path_free (s_path);
gtk_tree_path_free (path);
return;
}
g_array_insert_val (array, index, tmp);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (data), path, &iter,
- path, &iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_path_free (path);
if (free_s_path)
- gtk_tree_path_free (s_start_path);
+ gtk_tree_path_free (s_path);
}
/* Returns FALSE if the value was inserted, TRUE otherwise */
}
static void
-gtk_tree_model_sort_inserted (GtkTreeModel *s_model,
- GtkTreePath *s_path,
- GtkTreeIter *s_iter,
- gpointer data)
+gtk_tree_model_sort_row_inserted (GtkTreeModel *s_model,
+ GtkTreePath *s_path,
+ GtkTreeIter *s_iter,
+ gpointer data)
{
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreePath *path;
gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
tree_model_sort->stamp++;
- gtk_tree_model_inserted (GTK_TREE_MODEL (data), path, &iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_path_free (path);
}
static void
-gtk_tree_model_sort_has_child_toggled (GtkTreeModel *s_model,
- GtkTreePath *s_path,
- GtkTreeIter *s_iter,
- gpointer data)
+gtk_tree_model_sort_row_has_child_toggled (GtkTreeModel *s_model,
+ GtkTreePath *s_path,
+ GtkTreeIter *s_iter,
+ gpointer data)
{
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreePath *path;
path = gtk_tree_model_sort_convert_path_real (tree_model_sort, s_path, FALSE); if (path == NULL)
return;
gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
- gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (data), path, &iter);
+ gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_path_free (path);
if (free_s_path)
gtk_tree_path_free (s_path);
}
static void
-gtk_tree_model_sort_deleted (GtkTreeModel *s_model,
- GtkTreePath *s_path,
- gpointer data)
+gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model,
+ GtkTreePath *s_path,
+ gpointer data)
{
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreePath *path;
}
}
- gtk_tree_model_deleted (GTK_TREE_MODEL (data), path);
+ gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
tree_model_sort->stamp++;
gtk_tree_path_free (path);
}
static void
-gtk_tree_model_sort_reordered (GtkTreeModel *s_model,
- GtkTreePath *s_path,
- GtkTreeIter *s_iter,
- gint *new_order,
- gpointer data)
+gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
+ GtkTreePath *s_path,
+ GtkTreeIter *s_iter,
+ gint *new_order,
+ gpointer data)
{
gint i = 0;
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreeIter iter;
SortElt *elt = NULL;
GArray *array;
- GArray *new_array;
gint len;
/* header is used for checking if we can already sort things */
{
path = gtk_tree_model_sort_generate_path (iter.user_data);
- gtk_tree_model_reordered (GTK_TREE_MODEL (tree_model_sort), path,
- &iter, new_order);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_model_sort), path,
+ &iter, new_order);
}
else
{
/* toplevel list */
path = gtk_tree_path_new ();
- gtk_tree_model_reordered (GTK_TREE_MODEL (tree_model_sort),
- path, NULL, new_order);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_model_sort),
+ path, NULL, new_order);
}
gtk_tree_path_free (path);
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (tree_store), path, iter, path, iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (tree_store), path, iter, path, iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
g_node_destroy (G_NODE (iter->user_data));
tree_store->stamp++;
- gtk_tree_model_deleted (GTK_TREE_MODEL (tree_store), path);
+ gtk_tree_model_row_deleted (GTK_TREE_MODEL (tree_store), path);
if (parent != G_NODE (tree_store->root))
{
new_iter.stamp = tree_store->stamp;
new_iter.user_data = parent;
- gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (tree_store), path, &new_iter);
+ gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, &new_iter);
}
}
gtk_tree_path_free (path);
g_node_insert (parent_node, position, G_NODE (iter->user_data));
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
- gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
iter->user_data = new_node;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
- gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
iter->user_data = new_node;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
- gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
if (parent_node != tree_store->root)
{
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), parent);
- gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
+ gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
gtk_tree_path_append_index (path, 0);
}
else
{
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
}
- gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
}
else
if (parent_node != tree_store->root)
{
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), parent);
- gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
+ gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
gtk_tree_path_append_index (path, 0);
}
else
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
}
- gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
}
else
G_NODE (dest_iter->user_data)->data = copy_head;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), dest_iter);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (tree_store), path, dest_iter, path, dest_iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, dest_iter);
gtk_tree_path_free (path);
}
iter.stamp = tree_store->stamp;
iter.user_data = parent;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), &iter);
- gtk_tree_model_reordered (GTK_TREE_MODEL (tree_store),
- path, &iter, new_order);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
+ path, &iter, new_order);
gtk_tree_path_free (path);
g_free (new_order);
g_array_free (sort_array, TRUE);
tmp_iter.user_data = node->parent;
tmp_path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), &tmp_iter);
- gtk_tree_model_reordered (GTK_TREE_MODEL (tree_store),
- tmp_path, &tmp_iter,
- new_order);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
+ tmp_path, &tmp_iter,
+ new_order);
gtk_tree_path_free (tmp_path);
g_free (new_order);
gboolean expand,
gboolean open_all);
static void gtk_tree_view_real_select_cursor_parent (GtkTreeView *tree_view);
-static void gtk_tree_view_range_changed (GtkTreeModel *model,
+static void gtk_tree_view_row_changed (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
- GtkTreePath *end_path,
- GtkTreeIter *end_iter,
gpointer data);
-static void gtk_tree_view_inserted (GtkTreeModel *model,
+static void gtk_tree_view_row_inserted (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
-static void gtk_tree_view_has_child_toggled (GtkTreeModel *model,
+static void gtk_tree_view_row_has_child_toggled (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
-static void gtk_tree_view_deleted (GtkTreeModel *model,
+static void gtk_tree_view_row_deleted (GtkTreeModel *model,
GtkTreePath *path,
gpointer data);
-static void gtk_tree_view_reordered (GtkTreeModel *model,
+static void gtk_tree_view_rows_reordered (GtkTreeModel *model,
GtkTreePath *parent,
GtkTreeIter *iter,
gint *new_order,
*/
static void
-gtk_tree_view_range_changed (GtkTreeModel *model,
+gtk_tree_view_row_changed (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
- GtkTreePath *end_path,
- GtkTreeIter *end_iter,
gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *)data;
}
static void
-gtk_tree_view_inserted (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data)
+gtk_tree_view_row_inserted (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *) data;
gint *indices;
GtkTreePath *tmppath = _gtk_tree_view_find_path (tree_view,
tree,
tmpnode);
- gtk_tree_view_has_child_toggled (model, tmppath, NULL, data);
+ gtk_tree_view_row_has_child_toggled (model, tmppath, NULL, data);
gtk_tree_path_free (tmppath);
goto done;
}
}
static void
-gtk_tree_view_has_child_toggled (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data)
+gtk_tree_view_row_has_child_toggled (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *)data;
GtkTreeIter real_iter;
}
static void
-gtk_tree_view_deleted (GtkTreeModel *model,
- GtkTreePath *path,
- gpointer data)
+gtk_tree_view_row_deleted (GtkTreeModel *model,
+ GtkTreePath *path,
+ gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *)data;
GtkRBTree *tree;
static void
-gtk_tree_view_reordered (GtkTreeModel *model,
- GtkTreePath *parent,
- GtkTreeIter *iter,
- gint *new_order,
- gpointer data)
+gtk_tree_view_rows_reordered (GtkTreeModel *model,
+ GtkTreePath *parent,
+ GtkTreeIter *iter,
+ gint *new_order,
+ gpointer data)
{
GtkTreeView *tree_view = GTK_TREE_VIEW (data);
GtkRBTree *tree;
gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
- gtk_tree_view_range_changed, tree_view);
+ gtk_tree_view_row_changed, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
- gtk_tree_view_inserted, tree_view);
+ gtk_tree_view_row_inserted, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
- gtk_tree_view_has_child_toggled, tree_view);
+ gtk_tree_view_row_has_child_toggled, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
- gtk_tree_view_deleted, tree_view);
+ gtk_tree_view_row_deleted, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
- gtk_tree_view_reordered, tree_view);
+ gtk_tree_view_rows_reordered, tree_view);
if (tree_view->priv->tree)
{
_gtk_rbtree_free (tree_view->priv->tree);
}
g_object_ref (tree_view->priv->model);
g_signal_connect (tree_view->priv->model,
- "range_changed",
- G_CALLBACK (gtk_tree_view_range_changed),
+ "row_changed",
+ G_CALLBACK (gtk_tree_view_row_changed),
tree_view);
g_signal_connect (tree_view->priv->model,
- "inserted",
- G_CALLBACK (gtk_tree_view_inserted),
+ "row_inserted",
+ G_CALLBACK (gtk_tree_view_row_inserted),
tree_view);
g_signal_connect (tree_view->priv->model,
- "has_child_toggled",
- G_CALLBACK (gtk_tree_view_has_child_toggled),
+ "row_has_child_toggled",
+ G_CALLBACK (gtk_tree_view_row_has_child_toggled),
tree_view);
g_signal_connect (tree_view->priv->model,
- "deleted",
- G_CALLBACK (gtk_tree_view_deleted),
+ "row_deleted",
+ G_CALLBACK (gtk_tree_view_row_deleted),
tree_view);
g_signal_connect (tree_view->priv->model,
- "reordered",
- G_CALLBACK (gtk_tree_view_reordered),
+ "rows_reordered",
+ G_CALLBACK (gtk_tree_view_rows_reordered),
tree_view);
path = gtk_tree_path_new_root ();
if (length < old_length)
{
view_model->stamp++;
- gtk_tree_model_deleted (GTK_TREE_MODEL (view_model), path);
+ gtk_tree_model_row_deleted (GTK_TREE_MODEL (view_model), path);
}
else
{
GtkTreeIter iter;
iter.stamp = view_model->stamp;
iter.user_data = b;
- gtk_tree_model_inserted (GTK_TREE_MODEL (view_model), path, &iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (view_model), path, &iter);
}
gtk_tree_path_free (path);
}
}
path = gtk_tree_path_new ();
- gtk_tree_model_reordered (GTK_TREE_MODEL (view_model),
- path,
- NULL,
- new_order);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (view_model),
+ path,
+ NULL,
+ new_order);
gtk_tree_path_free (path);
g_free (new_order);
}
if (column)
{
gtk_tree_view_column_set_visible (column, ! gtk_tree_view_column_get_visible (column));
- gtk_tree_model_range_changed (model, path, &iter, path, &iter);
+ gtk_tree_model_row_changed (model, path, &iter);
}
gtk_tree_path_free (path);
}
projects / gtk4.git / commitdiff